FIX Preserve user message structure in generic system squash#1505
Merged
jbolor21 merged 10 commits intoJun 10, 2026
Conversation
jbolor21
approved these changes
Apr 29, 2026
romanlutz
changed the title
romanlutz
reviewed
May 3, 2026
added 2 commits
June 5, 2026 13:14
…o marks Merge instructions into the first text piece (or prepend an instruction-only text piece when none exists) so non-text pieces such as images are preserved in their original positions with their original data types. Also remove `@pytest.mark.asyncio` from the new tests since `asyncio_mode` is set to `auto` for the project. Co-authored-by: Copilot <[email protected]>
…neric-system-squash # Conflicts: # tests/unit/message_normalizer/test_generic_system_squash_normalizer.py
romanlutz
approved these changes
Jun 10, 2026
…neric-system-squash # Conflicts: # pyrit/message_normalizer/generic_system_squash.py # tests/unit/message_normalizer/test_generic_system_squash_normalizer.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Problem
GenericSystemSquashNormalizercurrently assumesmessages[1]is the user message and rebuilds it withMessage.from_prompt(). That causes two issues:userValidation
.venv/bin/pytest tests/unit/message_normalizer -q.venv/bin/ruff check pyrit/message_normalizer/generic_system_squash.py tests/unit/message_normalizer/test_generic_system_squash_normalizer.py